From 4c7d19b4dad2632b686c1be796abac16d8816046 Mon Sep 17 00:00:00 2001 From: Roy Franz Date: Thu, 2 Oct 2014 17:02:23 +0200 Subject: [PATCH] arm64: create xen.efi binary for arm64 The 'xen' binary for arm64 is both an Image file and a PE/COFF executable, copy it to xen.efi so that the 'make install' processing is shared with x86. Prior to this 'make install' was broken on arm64. Signed-off-by: Roy Franz Acked-by: Ian Campbell --- config/arm64.mk | 2 ++ xen/arch/arm/Makefile | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/config/arm64.mk b/config/arm64.mk index 4e57b3a3cb..6eafda2fac 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -15,3 +15,5 @@ LDFLAGS_DIRECT += -EL CONFIG_LOAD_ADDRESS ?= 0x80000000 IOEMU_CPU_ARCH ?= aarch64 + +EFI_DIR ?= /usr/lib64/efi diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index f330302871..9a25290a08 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -49,6 +49,9 @@ ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS) $(TARGET): $(TARGET)-syms $(TARGET).axf $(OBJCOPY) -O binary -S $< $@ +ifeq (arm64,$(XEN_TARGET_ARCH)) + ln -sf $(notdir $@) ../../$(notdir $@).efi +endif $(TARGET).axf: $(TARGET)-syms # XXX: VE model loads by VMA so instead of @@ -100,3 +103,4 @@ clean:: rm -f asm-offsets.s xen.lds rm -f $(BASEDIR)/.xen-syms.[0-9]* rm -f $(TARGET).axf + rm -f $(TARGET).efi -- 2.30.2